Merge to master from submaster with updated custom template utilization.