Merge "Change justification parameter from boolean to int." into oc-dev